Cleaned up from merge