Tidying up in preperation for queen system