More fixes to master (removed unneeded file)