Removing some pointless code