v 01.16.13 clean up mess
v 01.16.13