Remove Deprecated Code

This removes the deprecated code that was introduced in 1.3,  we stated that we will remove it in 1.4