Removed some things that were not necessary around here