more cleaning up hopefully for deployment