Rahul's additional aasplus commits + some cleanup