Removed deprecated functions

Remove the old @Deprecated functions since it should be safe.