Simplify Dockerfiles to minify layers