Remove count variable