Removed unnecessary mess