unused code removed, convention fixes