Removed old cruft + fixes