Unused classes from O2 library have been removed