Remove un-necessary files from old implementation