remove unrequired list adapter annotations and other misc code