Remove unecessary clutter