remove some code which may be over-engineering