More dependency trimming from src files