Non-useful code removed