wip: removed more useless stuff