Cleaning up unneeded bits