Removed dead code and its unit tests