Note replacement to deprecated methods and simplify them
Merge pull request #15 from lm/bc-fixes

Note replacement to deprecated methods and simplify them