removing ctable, get up to date w/ master