Config cleanup. Requirements unpinned for now