A bit of futher cleaning in the repo