Clean up of functions.php and bones.php