removed unused code, fixed blank file errors