Remove incorrect optimisation of check-remaining. Remove unnecessary remaining var passed through views.