Remove some cruft
Open/Close Wrapper Classes
0.5.7 --pre