Merge "Fixed resources not being released, code cleanup"