Removed commented/useless code