Removed unnessecarities