Major cleanup, removed deprecated methods