Cleaned more stuff