Fixed naming problem.
Removed old code
Release 2.1