Minor clean up. Removal of unnecessary properties.