remove props from model, and use components properly