Removed deprecated parts, cleaned it up a bit