Remove useless functionality