Removed deprecated method
Various changes