minor cleanup removing old commented code etc