Cleaned up manager and office