removing redundant model code - now its own module