split Dockerfiles back up
small docker cleanup