Use serveFile right away and remove unnecessary handlers