deprecated and unused methods removed
deprecated unused code removed
remove unused import
code formatting, clean-up unused code