Added some cleanup for now. This needs to be improved.