Remove Deprecated Usage