praveen|cleaning up commented code