get rid of track in resident model (revert later)