Rebuild of repository

Clean things up