(feat) removing un-needed parameters