Added additional cleanup for capstone project