Clean up folder, changed request handler