Tidy up from last commit