Hot fix: Removed useless code