Removed needless code