Removed comments and obsolete tables