#6647 remove old and bugged code
Merge pull request #242 from emarguin/remove_old_code

#6647 remove old and bugged code