Removed and amended some embarrassing silly buggers