Removed dead code + secured