Fixed StyleCop warnings, removed unneeded stuff