Cleanup unneeded code