Removed Deprecated and unused code.