removed test code
resolved conflcits
Merge pull request #3 from seth5000/mp_cleanup

removed test code