Require the right file, remove some old crap