Removing non-working stuff