Cleaned up retarded organization