cleaning up my half assed cleanup on last commit