[BUGFIX] Cleanup