General cleanup after talking to dev dudes