mainly style fixes and removing unused registration stuff