Code cleanup and removes unnecessary properties.