Removed obsolete code
Added missing file