removed unused modules, cleaned up code
added new contrib modules