Few library cleanup and new update