Removed count where useless