Syntax changes, removed unused code.