Nooliberry updates and cleanup