Removed all deprecated classes and usage of deprecated functions