Remove the unnecessary bits from the code