Removed all the clutter