Cleaned code - removed unsed classes and componenents. All classess have
javadoc style headers with Apache 2.0 licence permission