Remove obsolete file, simplify build