master - NEW: cleaning up more stuff