Removed lib code, it's handled seperately