Finished cleaning up the component core code.