Redundant code was removed (commented functions)