Removing table population code