Simplify the controller specific scripts a bit