Removed un-needed parameters