removed useless tests and data structure