spaces
Remove deprecated (or) constructs