Projector code cleanup