Minor changes and deleted unnececary files