cleanup code
remove unused code