Clean up usage of mapped table