Cleanup of SMWExpElement classes

Change-Id: If2dc18cabf8812a979e6f131e31ec145330cfe66