Removed script error & obsolete files