Removing shifts from methods in lib folder