Removed unused junk