Removed unused nemaspaces and other small fixes