Clean up in components class
version 0.2.1