before code clean up