Removed unnecessarities