Cleanup of unneeded code