@Paul started to get rid of library dependencies
@Paul removed dependencies on external libraries