Remove unneeded code (YAY)