Removed some crap that was never any use