Cleaned up some code, got rid of obsolete comments.