Removed dependencies on all external libraries