Avoid circular references through property converter
Cosmetics
Eliminate the use of dynamic properties
Clean up unused stuff