Code Cleaning

Removed non-needed library references, and Property settings.