Update sources and cleanup