Remove obsolete file
Adjust return types to account for errors

Preliminary attempt at error handling signature for internal store.