Removed outcommented stuff