Remove unncessary default packages and one whitespace in template