remove unused code, cleanup