Removing useless or non-working code