UPDATE: remove unnecessary code