Removed libraries, changed processing