Removed outcommented not used code