Fixed the price always being free and cleanup for next release