Removed Debug Statement and Commented out old code