Cleanup to remove warnings... :)