Removed unused code and moved Btx0 to new branch