3.1.0 - general cleanup and removal of unused elements