removed a lot of clutter