before co-develop: do some code cleanup