Updates and removing non-public stuff