Cleaning up unnecessary data when it's no longer needed

Hello eford, 

Please review the following commits I made in branch 'azulus-cleanup'.

1fe8a8ff5a1354cb189d40c6776f4bb74d9d6fd2 (2013-04-17 12:32:20 -0700)
Cleaning up unnecessary data when it's no longer needed

R=eford