Cleaning Up resources

Master clean up