Removed obsolete code and scripts