Added some cleanup code