removed some stuff that is uneeded for this branch
closes #5