Code cleanup - removed unsued imports and properties.