Removed all deprecated stuff finally