Removing pointless functions