Remove unnecessary code and file from baseline