Remove copy button and started to clean up