Final cleanup of everything but src