remove unused code; cleanup