removed unused class
fixed namespaces