Removing duplicate method bodies, remove check for "stop" and remove extra */