removed warnings for lots of old unused code. updatted versions