Remove 'data' folder, cleanup unused handlers