more cleanup

gutting bad code and consoldating old stuff