Removed all my crap as it's all in .extra