Non-OC code cleanup