rm some includes. refactor