Remove unused/redundant methods
Merge branch 'master' into weld