Remove IProjection class, clean up Projection