Removed junk codes