Redundant function/arguments removed