updated libraries, striped obsolete stuff