Quixey - Removed some redundant code