Cleaned up Babbles mess