20120418-1242. some cleanup