#1304 - general cleanup