Removed needless things