Revamp

stripped old stuff