Make Lightweight Version actually lightweight!

Yea.