Removed non-library stuff