Clean up files overridden in build, Remove Safestrap Support