More reqs and cleanup