Removed commented code and unused images