Remove the remaining library classes