cleaned in organism class
more cleanup of organism functions