Cleaned up last merge