Removed commented out calls