Remvoing commented out old/unused code