Code cleanup

Remove useless code