Clean up style and remove more unused functionality.