Removed unused code, test crap