Removed library stuff