Cleanup redundant model code
Update instructions on running and building