Cleanup types - possible broken commit though