Venus code cleanup

@kvas-damian / @vforge