removed lazyness, unused logic
package version