Removed some unused junk