Cleaned up. Obsolete files removed.