Delete code smells