Remove magic constants, forgot files, etc