Clean up #46