Remove more unneeded code :)