Removed un-needed junk