Cleaned up some vestigial logic