Remove some useless code, more will come