Cleaned up unused properties and usings.