Deleting redundant and obsolete code
Merge branch 'master' of https://github.com/grantcp/DaddyEagle