Removed commented out code
Move lib