Begin to clean up code; remove vip/ potd from shop