Core: Remove White spaces