Removed all references to deprecated methods