Clean up system

Clean up system