cleaned up unused code, whitespace