Removed commented out functions that wasn't being used.