fix + remove unused code