initial push of xwing, removing excess controls