Merge "rsLib cleanup"