removed and cleaning up