Remove redunant code
Update build