UPDATE: ejs pak and cleanup.