code clean up and remove unused