Removed dependency on 3rd party libraries