cleaning up unneeded code
Merge pull request #1 from davidamoen/develop

cleaning up unneeded code