Removed deprecated methods
Preparing for 6.0.0.pre1 release