booking engine controller clean up