Cleanup [SERINA-10]