Clean up unneeded code