cleanup
Wiki pages - TODO: howto add those correctly?