removing pointless code