Clean up code comment & deprecation message