removed needless code