Removed some wishlist suggestions from the code onto the wiki page on github. Removed dead code.