Remove unnecessary code

Removed most, if not all, break tags and old code.