Removed unwanted functions, refactored renames and documentated as required
Documented as required and marked one's to be checked
Merge branch 'tanjot' into chaudhary