Removed code not required for lib