Remove some @Deprecated that I added for testing