Cleaning up Classic and fixing a frame increase problem