removing some unnecessary functions
Merge commit 'c2c6448'