Remove unused arguments; convenience methods