Integration of Storage and Message Center, Code Cleanup