Clean up some
When using dependant option skip adding package if evaluated to false
Updated implementation of lite build