remove unused code and no longer relevant comments