Remove uneeded code