And finally clean up today's (8/24/2013) ugly database