Add deprecation notice, remove old code