Solution Tidy

Interface update and Model duplication removal