remove most clutter (todo)