Removed some initialization not meant for the general usage