Some skills stuff. Clean up