Various changes
removed