(WIP) Remove some useless code