Akash - removing more dead code
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/rapidftr/RapidFTR