Removed unnecessaries