Non-important code removed