removing from most functions