More cleanup

Trying to use less from bot