@raydavis will remove, what about the TODO i left in the canvas_user_sites? are we going to differentiate on that end?