point before removing extra fields
cleaned up
clean up and dockerize