Removed some obsolete things