[SEE NOTE BEFORE MERGING] Cleanup

This depends on #2. Review and merge that first then this one will make more sense.