Clean project folder plus micah changes