cleaning up some componenets