Simple is better, I don't need extra files for that stuff
Remove references to old files