cleanup : remove redundant code