Final trim

Just the essentials and a single sample, now.