Remove Contract model
WIP :: work on models