Final cleanup

Downsized and simplyfied