Removed commented code and dead code
Removed unused declarations and commented code