cleanup
cleaner match model
remove unneeded code