More fixes
Remove temporary crap