removed junk from model