More sources and cleanup