Cleanup and added qbaka