Clenup unneeded code