Cleanup some ununed classes