Removed Superfluous things