Some cleaning up
Test cleaning up