Code style
Removed legacy code