code cleanup Version alpha