Prevent Removal Glitches, improved build file