#50 and global clean up