big cleanup of unused code