Removed deprecated stuff for 1.0, closes #391