Cleaned up enough for git publishing