Enabled P6800 repositories && clean-up