refactor: cleanup some unneeded conditions