Removed some unneeded internal classes