removed unused code and changed the min sdk level to 16