Tested with actual system and deleted unneeded old files.