remove unused code
remove compiler warnings