Removed all references to external libraries