Removed extra comment functions