Trimmed down build again