removed empty lines
Removed legacy method