Fixed the lockscreen-date patch

Also removed some useless lines from
other patches.