removing useless complexity