Clean up 3

Clean up 3