More complex cleanup + Build fix