Finish roles, general cleanup