Removed legacy code
Removed unnecessary PHP breaks