Fixed all of the inner-library references and deleted a couple locks