Remove uneeded extra code