REFACTOR: Cleanup ejs pak