Removed junk and stuff