Made more managers cleaner