Don't include padlock code
Merge pull request #1829 from rubenk/remove-padlock

Don't include padlock code