Remove core/contract
Fix nit
Fix nits